add AS=CC and ASFLAGS=CFLAGS substitutions so that gtk+ can be built with

2001-10-11  James Henstridge  <james@daa.com.au>

        * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
        that gtk+ can be built with automake 1.5 while not breaking
        things for automake 1.4.

diff --git a/ChangeLog b/ChangeLog
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ac9a9e96d691bc92c74dd71b5d01ef948ba6fc44..1cc7cce3c39290b37101bdebba1ef2aca32d9f0d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-10-11  James Henstridge  <james@daa.com.au>
+
+       * configure.in: add AS=CC and ASFLAGS=CFLAGS substitutions so
+       that gtk+ can be built with automake 1.5 while not breaking
+       things for automake 1.4.
+
 Wed Oct 10 12:48:38 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_init_check): Call setlocale (LC_ALL, "").

diff --git a/configure.in b/configure.in
index 91fd26cc9c6bd4eb79811c44a504cc78b850722d..78bea98e2b9719dc19288a9b1e8f6467e26e5067 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -102,6 +102,12 @@ AM_CONFIG_HEADER(config.h)
 dnl Initialize libtool
 AM_PROG_LIBTOOL
 
+dnl Set AS and ASFLAGS so that automake 1.5 will be happy
+AS="\${CC}"
+ASFLAGS="\${CFLAGS}"
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
+
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE